From f1e24ca30af645375aa69f76dc8d96550d663ad4 Mon Sep 17 00:00:00 2001 From: Adrien Plazas Date: Tue, 24 Jul 2018 14:37:57 +0200 Subject: [PATCH] Adwaita: Propagate bg color to titlebar separator descendants Gives the same background color to all separators descending from a title bar than to its direct childrens. This prevents separators which are in a titlebar but not direct children from the widget with the titlebar style class from being almost transparent and hence it prevent them from revealing the clear color of the window's titlebar (black). https://gitlab.gnome.org/GNOME/gtk/issues/1231 --- gtk/theme/Adwaita/_common.scss | 2 +- gtk/theme/Adwaita/gtk-contained-dark.css | 6 +++--- gtk/theme/Adwaita/gtk-contained.css | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index d898075488..f7b26a265a 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -1715,7 +1715,7 @@ headerbar { // headerbar border rounding box-shadow: none; } - > separator { background-color: $borders_color; } // FIXME: use darker border? + separator { background-color: $borders_color; } // FIXME: use darker border? @extend %titlebar; } diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index 6468e2e2be..94d5d4b576 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -692,7 +692,7 @@ window:not(.tiled):not(.maximized):not(.fullscreen):not(.solid-csd) stack header window.csd > .titlebar:not(headerbar) { padding: 0; background-color: transparent; background-image: none; border-style: none; border-color: transparent; box-shadow: none; } -.titlebar:not(headerbar) > separator { background-color: #252526; } +.titlebar:not(headerbar) separator { background-color: #252526; } window.devel headerbar.titlebar:not(.selection-mode) { background: transparent -gtk-icontheme("system-run-symbolic") 90% 0/256px 256px no-repeat, linear-gradient(to left, #3b4049 8%, #3f3e40 25%); color: rgba(238, 238, 236, 0.1); } @@ -1472,9 +1472,9 @@ progressbar:backdrop { box-shadow: none; transition: 200ms ease-out; } progressbar progress { /* share most of scales' */ /* override insensitive that is specific to progress */ border-radius: 1.5px; } -progressbar progress:disabled { background-color: #919494; border-color: #919494; } +progressbar progress:disabled { background-color: #969696; border-color: #969696; } -progressbar progress:backdrop:disabled { background-color: #566164; border-color: #566164; } +progressbar progress:backdrop:disabled { background-color: #656466; border-color: #656466; } progressbar progress.left { border-top-left-radius: 2px; border-bottom-left-radius: 2px; } diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index cdceb2927a..8263e98444 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -700,7 +700,7 @@ window:not(.tiled):not(.maximized):not(.fullscreen):not(.solid-csd) stack header window.csd > .titlebar:not(headerbar) { padding: 0; background-color: transparent; background-image: none; border-style: none; border-color: transparent; box-shadow: none; } -.titlebar:not(headerbar) > separator { background-color: #b6b6b3; } +.titlebar:not(headerbar) separator { background-color: #b6b6b3; } window.devel headerbar.titlebar:not(.selection-mode) { background: transparent -gtk-icontheme("system-run-symbolic") 90% 0/256px 256px no-repeat, linear-gradient(to left, #d6dee7 8%, #e8e8e7 25%); color: rgba(46, 52, 54, 0.1); } -- 2.30.2